From: Jasper St. Pierre Date: Sat, 22 Feb 2014 23:00:57 +0000 (-0500) Subject: shell-global: Only set the scale factor if get_setting succeeded X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~2708 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=29addc499ca0f8dc5bf9cf6d18eaaa01a5c2b985;p=gnome-shell.git shell-global: Only set the scale factor if get_setting succeeded If gdk_screen_get_setting fails, like if it's running without XSettings, then the GValue will have a value of 0. A lot of code tries to divide by the scale factor. This produces NaN, and combined with the fact that NaN is "leaky", we very quickly end up spinning out of control. --- diff --git a/src/shell-global.c b/src/shell-global.c index 7e0ac8b56..59b5273d1 100644 --- a/src/shell-global.c +++ b/src/shell-global.c @@ -756,8 +756,8 @@ update_scale_factor (GdkScreen *screen, gpointer data) GValue value = G_VALUE_INIT; g_value_init (&value, G_TYPE_INT); - gdk_screen_get_setting (global->gdk_screen, "gdk-window-scaling-factor", &value); - g_object_set (context, "scale-factor", g_value_get_int (&value), NULL); + if (gdk_screen_get_setting (global->gdk_screen, "gdk-window-scaling-factor", &value)) + g_object_set (context, "scale-factor", g_value_get_int (&value), NULL); } /* This is an IBus workaround. The flow of events with IBus is that every time